From fadf487d95927e541680e7690d1ab3d2ada86d01 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 2 Aug 2005 19:32:48 +0000 Subject: [PATCH] Remove USB front/back from 2.4 build, totally. --- Config.mk | 2 +- linux-2.4-xen-sparse/arch/xen/Makefile | 2 -- linux-2.4-xen-sparse/arch/xen/config.in | 14 ++------------ 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Config.mk b/Config.mk index facf5ec123..3599973de9 100644 --- a/Config.mk +++ b/Config.mk @@ -3,7 +3,7 @@ # Currently supported architectures: x86_32, x86_64 XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/) XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) -XEN_TARGET_X86_PAE ?= n +XEN_TARGET_X86_PAE ?= y # Tools to run on system hosting the build HOSTCC = gcc diff --git a/linux-2.4-xen-sparse/arch/xen/Makefile b/linux-2.4-xen-sparse/arch/xen/Makefile index 97a622e1bd..e8e161a395 100644 --- a/linux-2.4-xen-sparse/arch/xen/Makefile +++ b/linux-2.4-xen-sparse/arch/xen/Makefile @@ -61,7 +61,6 @@ SUBDIRS += arch/xen/drivers/console SUBDIRS += arch/xen/drivers/evtchn SUBDIRS += arch/xen/drivers/blkif SUBDIRS += arch/xen/drivers/netif -#SUBDIRS += arch/xen/drivers/usbif SUBDIRS += arch/xen/drivers/balloon ifdef CONFIG_XEN_PRIVILEGED_GUEST SUBDIRS += arch/xen/drivers/dom0 @@ -72,7 +71,6 @@ CORE_FILES += arch/xen/drivers/evtchn/drv.o CORE_FILES += arch/xen/drivers/console/drv.o DRIVERS += arch/xen/drivers/blkif/drv.o DRIVERS += arch/xen/drivers/netif/drv.o -DRIVERS += arch/xen/drivers/usbif/drv.o ifdef CONFIG_XEN_PRIVILEGED_GUEST CORE_FILES += arch/xen/drivers/dom0/drv.o endif diff --git a/linux-2.4-xen-sparse/arch/xen/config.in b/linux-2.4-xen-sparse/arch/xen/config.in index 23492fb5c8..a8784a07a5 100644 --- a/linux-2.4-xen-sparse/arch/xen/config.in +++ b/linux-2.4-xen-sparse/arch/xen/config.in @@ -16,14 +16,10 @@ mainmenu_option next_comment comment 'Xen' bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST bool 'Device-driver domain (physical device access)' CONFIG_XEN_PHYSDEV_ACCESS -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then - bool 'USB-device backend driver' CONFIG_XEN_USB_BACKEND -fi bool 'Scrub memory before freeing it to Xen' CONFIG_XEN_SCRUB_PAGES bool 'Network-device frontend driver' CONFIG_XEN_NETDEV_FRONTEND bool 'Block-device frontend driver' CONFIG_XEN_BLKDEV_FRONTEND bool 'Block-device uses grant tables' CONFIG_XEN_BLKDEV_GRANT -bool 'USB-device frontend driver' CONFIG_XEN_USB_FRONTEND endmenu # The IBM S/390 patch needs this. define_bool CONFIG_NO_IDLE_HZ y @@ -267,7 +263,7 @@ fi source drivers/char/Config.in -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" -o "$CONFIG_XEN_USB_FRONTEND" = "y" ]; then +if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then source drivers/media/Config.in fi @@ -302,14 +298,8 @@ if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then endmenu fi -if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" -o "$CONFIG_XEN_USB_FRONTEND" = "y" ]; then - if [ "$CONFIG_XEN_USB_FRONTEND" = "y" -o "$CONFIG_XEN_USB_BACKEND" = "y" ]; then - define_bool CONFIG_USB y - fi - source drivers/usb/Config.in -fi - if [ "$CONFIG_XEN_PHYSDEV_ACCESS" = "y" ]; then + source drivers/usb/Config.in source net/bluetooth/Config.in fi -- 2.30.2